From: Peter Michael Green Date: Sat, 8 Apr 2017 14:51:40 +0000 (+0000) Subject: Manual merge of version 3.22.9-4+rpi1 and 3.22.11-1 to produce 3.22.11-1+rpi1 X-Git-Tag: archive/raspbian/3.22.11-1+rpi1~1 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf;p=gtk%2B3.0.git Manual merge of version 3.22.9-4+rpi1 and 3.22.11-1 to produce 3.22.11-1+rpi1 --- bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf diff --cc debian/changelog index 1049252205,9c01a6feab..257d8a895a --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,9 +1,22 @@@ - gtk+3.0 (3.22.9-4+rpi1) stretch-staging; urgency=medium ++gtk+3.0 (3.22.11-1+rpi1) stretch-staging; urgency=medium + + [changes brought forward from 3.16.6-1+rpi1 by Peter Michael Green at Fri, 25 Sep 2015 01:49:45 +0000] + * Disable wayland backend in debian/rules + * Move libegl1-mesa-dev and libwayland-dev from Depends and Build-Depends to + Build-Conflicts + * Add symbols file hack for wayland changes. + * Fix clean target. + [changes introduced in 3.20.6-2+rpi1 by Peter Michael Green] + * Disable testsuite. + - -- Peter Michael Green Sun, 26 Mar 2017 15:13:30 +0000 ++ -- Raspbian forward porter Fri, 07 Apr 2017 03:45:05 +0000 ++ + gtk+3.0 (3.22.11-1) unstable; urgency=medium + + * New upstream release. + * Drop patches which have been merged upstream. + + -- Michael Biebl Fri, 24 Mar 2017 02:27:48 +0100 gtk+3.0 (3.22.9-4) unstable; urgency=medium diff --cc debian/rules index 1d50d27a1d,6ba7a4c781..e7a6614f2c --- a/debian/rules +++ b/debian/rules @@@ -162,15 -162,8 +162,11 @@@ clean:: debian/contro rm -f $(call dh_subst_files,$(DEB_ALL_PACKAGES)) rm -f testsuite/reftests/*.ui.known_fail rm -rf debian/build debian/install + sed -i s/optional=nowayland/arch=linux-any/ debian/libgtk-3-0.symbols + rm -rf debian/build debian/install - # The build system does not automatically update the GResource files - # when resources change. Force an update since we modify CSS files in - # Revert-move-of-.flat-from-frame-border-to-frame.patch. - rm -f gtk/gtkresources.c gtk/gtkresources.h pre-build:: + sed -i s/arch=linux-any/optional=nowayland/ debian/libgtk-3-0.symbols # Mark reftests with known failures as non-fatal touch testsuite/reftests/nonresizable-size.ui.known_fail touch testsuite/reftests/window-show-contents-on-map.ui.known_fail